popupMenu: Hide ornament by default

We have always defaults to an empty ornament, so that menu items
are always aligned, even when radio items are used.

However radio items are fairly rare, so most of the time we end
up with an extra margin with no purpose. The design team now
prefers radio items to only align with each other, so that regular
items get the expected margin.

Change the defaults accordingly.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2843>

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 7b876ed24658e7d0da8ced1d29ed74a0b645e8f7..ff503a1428fd7ec82d010281a1eb6ef16cad8df0 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -96,7 +96,7 @@ var PopupBaseMenuItem = GObject.registerClass({
 
         this._ornamentIcon = new St.Icon({style_class: 'popup-menu-ornament'});
         this.add(this._ornamentIcon);
-        this.setOrnament(Ornament.NONE);
+        this.setOrnament(Ornament.HIDDEN);
 
         this._parent = null;
         this._active = false;

diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index 4ab716a0cc90d923176e28e74be2f7aa4b7d857a..8588dbb87f1f64bdb3303d054a58dd8831c3ea55 100644 (file)
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -257,7 +257,6 @@ class BluetoothToggle extends QuickMenuToggle {
             ellipsize: Pango.EllipsizeMode.NONE,
             line_wrap: true,
         });
-        this._placeholderItem.setOrnament(PopupMenu.Ornament.HIDDEN);
         this.menu.addMenuItem(this._placeholderItem);
 
         this._deviceSection.actor.bind_property('visible',

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 000279e85c349f08f38ef4f7c0a1717e63f17ef1..eee89d0218272128c234cd7884e6f0e47d71a5f1 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -244,7 +244,6 @@ const NMSectionItem = GObject.registerClass({
 
         // Turn into an empty container with no padding
         this.styleClass = '';
-        this.setOrnament(PopupMenu.Ornament.HIDDEN);
 
         // Add intermediate section; we need this for submenu support
         this._mainSection = new PopupMenu.PopupMenuSection();